bitkeeper revision 1.1611 (429c6853QfpsOT-V0bESe-1WhWLOWw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 13:36:19 +0000 (13:36 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 13:36:19 +0000 (13:36 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk


Trivial merge